projects / gtk+3.0.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 114267c)
Visual C++ projects: Update .dll/.lib naming
authorChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 26 Jul 2012 07:39:51 +0000 (15:39 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 26 Jul 2012 07:39:51 +0000 (15:39 +0800)
Remove the "-win32-" from the output file names for the GDK and GTK+ DLLs,
like what is now done for quite a while on other platforms
(and MinGW builds), for consistency reasons.  This is due to GDK/GTK+
are buildable with multiple backends.

Note: For references, the Windows build only builds the Win32 backend
for the time being.

build/win32/vs10/gdk.vcxprojin patch | blob | history
build/win32/vs10/gtk.vcxprojin patch | blob | history
build/win32/vs9/gdk.vcprojin patch | blob | history
build/win32/vs9/gtk.vcprojin patch | blob | history

diff --git a/build/win32/vs10/gdk.vcxprojin b/build/win32/vs10/gdk.vcxprojin
index 6c367c51ec72894de8cded32be4a8a512047e724..ae34f614e507ae3eedca4dae56bcfeb481b0b4f5 100644 (file)
--- a/build/win32/vs10/gdk.vcxprojin
+++ b/build/win32/vs10/gdk.vcxprojin
@@ -81,11 +81,11 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -101,13 +101,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -126,11 +126,11 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -146,13 +146,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin
index dedb30f93f624b8360bf0b9e1c8ceec3fec80616..6288f886c866d86e3b51226687b15544e8c27755 100644 (file)
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+\b<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -81,11 +81,11 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -101,13 +101,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -126,11 +126,11 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -146,13 +146,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin
index 6e9983140f4902c9cce29a3e60ba12dd4be8eb54..6c36dbae7b60e734e03c18f7ff5af3e0ae703bac 100644 (file)
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -43,12 +43,12 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib"\r
-                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gdk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"\r
                                TargetMachine="1"\r
                        />\r
                </Configuration>\r
@@ -73,14 +73,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib"\r
-                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gdk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"\r
                                TargetMachine="1"\r
                        />\r
                </Configuration>\r
@@ -108,12 +108,12 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib"\r
-                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gdk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"\r
                                TargetMachine="17"\r
                        />\r
                </Configuration>\r
@@ -138,14 +138,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib"\r
-                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gdk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"\r
                                TargetMachine="17"\r
                        />\r
                </Configuration>\r
diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index 8748bc3502f090bccdb784c9aed6d8885e56c84e..fff2af661b8e1a02310f59719b727ba6958b00dd 100644 (file)
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -43,12 +43,12 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
-                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"\r
                                TargetMachine="1"\r
                        />\r
                </Configuration>\r
@@ -73,14 +73,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
-                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"\r
                                TargetMachine="1"\r
                        />\r
                </Configuration>\r
@@ -108,12 +108,12 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
-                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"\r
                                TargetMachine="17"\r
                        />\r
                </Configuration>\r
@@ -138,14 +138,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
-                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"\r
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"\r
                                TargetMachine="17"\r
                        />\r
                </Configuration>\r
Unnamed repository; edit this file 'description' to name the repository.